Skip to content

BridgeJS: Fix issues exporting nested types #783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wfltaylor wants to merge 1 commit into
base: main
Choose a base branch
from
Open

BridgeJS: Fix issues exporting nested types #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
565 changes: 303 additions & 262 deletions Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ClassWithNestedTypes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
@JS class Account {
@JS enum Role: String {
case admin
case guest
}

@JS struct Credentials {
var token: String

@JS init(token: String) {
self.token = token
}

@JS static var maxLength: Int { 64 }

@JS static func empty() -> Credentials {
Credentials(token: "")
}
}

@JS var name: String

@JS var role: Role { .admin }

@JS static var defaultRole: Role { .guest }

@JS init(name: String) {
self.name = name
}

@JS func describe() -> String {
name
}
}
52 changes: 52 additions & 0 deletions Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StructWithNestedTypes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
@JS struct Shape {
@JS enum Kind: String {
case circle
case square
}

var label: String

@JS init(label: String) {
self.label = label
}
}

@JS struct Widget {
@JS enum Variant: String {
case button
case slider
}

@JS struct Layout {
@JS enum Alignment: String {
case leading
case trailing
}

var padding: Int
}

@JS struct Bounds {
var width: Int
var height: Int

@JS init(width: Int, height: Int) {
self.width = width
self.height = height
}

@JS static var dimensions: Int {
2
}

@JS static func zero() -> Bounds {
Bounds(width: 0, height: 0)
}
}

var name: String

@JS init(name: String) {
self.name = name
}
}
218 changes: 218 additions & 0 deletions ...geJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ClassWithNestedTypes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
{
"exported" : {
"aliases" : [

],
"classes" : [
{
"constructor" : {
"abiName" : "bjs_Account_init",
"effects" : {
"isAsync" : false,
"isStatic" : false,
"isThrows" : false
},
"parameters" : [
{
"label" : "name",
"name" : "name",
"type" : {
"string" : {

}
}
}
]
},
"methods" : [
{
"abiName" : "bjs_Account_describe",
"effects" : {
"isAsync" : false,
"isStatic" : false,
"isThrows" : false
},
"name" : "describe",
"parameters" : [

],
"returnType" : {
"string" : {

}
}
}
],
"name" : "Account",
"properties" : [
{
"isReadonly" : false,
"isStatic" : false,
"name" : "name",
"type" : {
"string" : {

}
}
},
{
"isReadonly" : true,
"isStatic" : false,
"name" : "role",
"type" : {
"rawValueEnum" : {
"_0" : "Account.Role",
"_1" : "String"
}
}
},
{
"isReadonly" : true,
"isStatic" : true,
"name" : "defaultRole",
"staticContext" : {
"className" : {
"_0" : "Account"
}
},
"type" : {
"rawValueEnum" : {
"_0" : "Account.Role",
"_1" : "String"
}
}
}
],
"swiftCallName" : "Account"
}
],
"enums" : [
{
"cases" : [
{
"associatedValues" : [

],
"name" : "admin"
},
{
"associatedValues" : [

],
"name" : "guest"
}
],
"emitStyle" : "const",
"name" : "Role",
"namespace" : [
"Account"
],
"rawType" : "String",
"staticMethods" : [

],
"staticProperties" : [

],
"swiftCallName" : "Account.Role",
"tsFullPath" : "Account.Role"
}
],
"exposeToGlobal" : false,
"functions" : [

],
"protocols" : [

],
"structs" : [
{
"constructor" : {
"abiName" : "bjs_Account_Credentials_init",
"effects" : {
"isAsync" : false,
"isStatic" : false,
"isThrows" : false
},
"parameters" : [
{
"label" : "token",
"name" : "token",
"type" : {
"string" : {

}
}
}
]
},
"methods" : [
{
"abiName" : "bjs_Account_Credentials_static_empty",
"effects" : {
"isAsync" : false,
"isStatic" : true,
"isThrows" : false
},
"name" : "empty",
"parameters" : [

],
"returnType" : {
"swiftStruct" : {
"_0" : "Account.Credentials"
}
},
"staticContext" : {
"structName" : {
"_0" : "Account_Credentials"
}
}
}
],
"name" : "Credentials",
"namespace" : [
"Account"
],
"properties" : [
{
"isReadonly" : true,
"isStatic" : false,
"name" : "token",
"namespace" : [
"Account"
],
"type" : {
"string" : {

}
}
},
{
"isReadonly" : true,
"isStatic" : true,
"name" : "maxLength",
"staticContext" : {
"structName" : {
"_0" : "Account_Credentials"
}
},
"type" : {
"integer" : {
"_0" : {
"isSigned" : true,
"width" : "word"
}
}
}
}
],
"swiftCallName" : "Account.Credentials"
}
]
},
"moduleName" : "TestModule",
"usedExternalModules" : [

]
}
Loading
Loading